bitkeeper revision 1.710 (4024ef6f9YlWWmhZ6dOHYR2Gp5i6vw)

xl_vbd.c:
  Fix VBD-updated check in XL.

diff --git a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
index b106c57e69156295c9a93a5e4b9c33f91fa7b0b2..77a3f0e40196604483fccffce4ea17490bcb17e3 100644 (file)
--- a/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
+++ b/xenolinux-2.4.24-sparse/arch/xeno/drivers/block/xl_vbd.c
@@ -456,7 +456,8 @@ void xlvbd_update_vbds(void)
         }
         else
         {
-            if ( (memcmp(&old_info[i], &new_info[j], sizeof(xen_disk_t)) == 0) ||
+            if ( ((old_info[i].capacity == new_info[j].capacity) &&
+                  (old_info[i].info == new_info[j].info)) ||
                  (xlvbd_remove_device(old_info[i].device) != 0) )
                 memcpy(&merged_info[k++], &old_info[i], sizeof(xen_disk_t));
             else if ( xlvbd_init_device(&new_info[j]) == 0 )